From 232858fb8aac281f871ae345edd6a8b0057e76fe Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Mon, 16 May 2016 00:07:04 +0300 Subject: [PATCH] fix test_cargo_test --- tests/test_cargo_test.rs | 206 ++++++++++++++++++--------------------- 1 file changed, 95 insertions(+), 111 deletions(-) diff --git a/tests/test_cargo_test.rs b/tests/test_cargo_test.rs index 0a855cc3f..da631fdb8 100644 --- a/tests/test_cargo_test.rs +++ b/tests/test_cargo_test.rs @@ -33,16 +33,16 @@ test!(cargo_test_simple { execs().with_stdout("hello\n")); assert_that(p.cargo("test"), - execs().with_stdout(format!("\ + execs().with_stderr(format!("\ [COMPILING] foo v0.5.0 ({}) -[RUNNING] target[..]foo-[..] - +[RUNNING] target[..]foo-[..]", p.url())) + .with_stdout(" running 1 test test test_hello ... ok test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured -", p.url()))); +")); }); test!(cargo_test_release { @@ -78,7 +78,7 @@ test!(cargo_test_release { .file("bar/src/lib.rs", "pub fn bar() {}"); assert_that(p.cargo_process("test").arg("-v").arg("--release"), - execs().with_stdout(format!("\ + execs().with_stderr(format!("\ [COMPILING] bar v0.0.1 ({dir}/bar) [RUNNING] [..] -C opt-level=3 [..] [COMPILING] foo v0.1.0 ({dir}) @@ -86,27 +86,27 @@ test!(cargo_test_release { [RUNNING] [..] -C opt-level=3 [..] [RUNNING] [..] -C opt-level=3 [..] [RUNNING] `[..]target[..]foo-[..]` - +[RUNNING] `[..]target[..]test-[..]` +[DOCTEST] foo +[RUNNING] `rustdoc --test [..]lib.rs[..]`", dir = p.url())) + .with_stdout(" running 1 test test test ... ok test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured -[RUNNING] `[..]target[..]test-[..]` running 1 test test test ... ok test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured -[DOCTEST] foo -[RUNNING] `rustdoc --test [..]lib.rs[..]` running 0 tests test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured -", dir = p.url()))); +")); }); test!(cargo_test_verbose { @@ -118,17 +118,17 @@ test!(cargo_test_verbose { "#); assert_that(p.cargo_process("test").arg("-v").arg("hello"), - execs().with_stdout(format!("\ + execs().with_stderr(format!("\ [COMPILING] foo v0.5.0 ({url}) [RUNNING] `rustc src[..]foo.rs [..]` -[RUNNING] `[..]target[..]foo-[..] hello` - +[RUNNING] `[..]target[..]foo-[..] hello`", url = p.url())) + .with_stdout(" running 1 test test test_hello ... ok test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured -", url = p.url()))); +")); }); test!(many_similar_names { @@ -241,31 +241,30 @@ test!(test_with_lib_dep { "); assert_that(p.cargo_process("test"), - execs().with_stdout(format!("\ + execs().with_stderr(format!("\ [COMPILING] foo v0.0.1 ({}) [RUNNING] target[..]baz-[..] - +[RUNNING] target[..]foo[..] +[DOCTEST] foo", p.url())) + .with_stdout(" running 1 test test bin_test ... ok test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured -[RUNNING] target[..]foo[..] running 1 test test lib_test ... ok test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured -[DOCTEST] foo running 1 test test foo_0 ... ok test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured -", - p.url()))) +")) }); test!(test_with_deep_lib_dep { @@ -308,25 +307,24 @@ test!(test_with_deep_lib_dep { p2.build(); assert_that(p.cargo_process("test"), execs().with_status(0) - .with_stdout(&format!("\ + .with_stderr(&format!("\ [COMPILING] foo v0.0.1 ([..]) [COMPILING] bar v0.0.1 ({dir}) [RUNNING] target[..] - +[DOCTEST] bar", dir = p.url())) + .with_stdout(" running 1 test test bar_test ... ok test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured -[DOCTEST] bar running 1 test test bar_0 ... ok test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured -", - dir = p.url()))); +")); }); test!(external_test_explicit { @@ -355,30 +353,29 @@ test!(external_test_explicit { "#); assert_that(p.cargo_process("test"), - execs().with_stdout(format!("\ + execs().with_stderr(format!("\ [COMPILING] foo v0.0.1 ({}) [RUNNING] target[..]foo-[..] - +[RUNNING] target[..]test-[..] +[DOCTEST] foo", p.url())) + .with_stdout(" running 1 test test internal_test ... ok test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured -[RUNNING] target[..]test-[..] running 1 test test external_test ... ok test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured -[DOCTEST] foo running 0 tests test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured -", - p.url()))) +")) }); test!(external_test_implicit { @@ -403,29 +400,29 @@ test!(external_test_implicit { "#); assert_that(p.cargo_process("test"), - execs().with_stdout(format!("\ + execs().with_stderr(format!("\ [COMPILING] foo v0.0.1 ({}) [RUNNING] target[..]external-[..] - +[RUNNING] target[..]foo-[..] +[DOCTEST] foo", p.url())) + .with_stdout(" running 1 test test external_test ... ok test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured -[RUNNING] target[..]foo-[..] running 1 test test internal_test ... ok test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured -[DOCTEST] foo running 0 tests test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured -", p.url()))) +")) }); test!(dont_run_examples { @@ -460,23 +457,22 @@ test!(pass_through_command_line { assert_that(p.cargo_process("test").arg("bar"), execs().with_status(0) - .with_stdout(&format!("\ + .with_stderr(&format!("\ [COMPILING] foo v0.0.1 ({dir}) [RUNNING] target[..]foo-[..] - +[DOCTEST] foo", dir = p.url())) + .with_stdout(" running 1 test test bar ... ok test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured -[DOCTEST] foo running 0 tests test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured -", - dir = p.url()))); +")); assert_that(p.cargo("test").arg("foo"), execs().with_status(0) @@ -541,30 +537,29 @@ test!(lib_bin_same_name { "); assert_that(p.cargo_process("test"), - execs().with_stdout(format!("\ + execs().with_stderr(format!("\ [COMPILING] foo v0.0.1 ({}) [RUNNING] target[..]foo-[..] - +[RUNNING] target[..]foo-[..] +[DOCTEST] foo", p.url())) + .with_stdout(" running 1 test test [..] ... ok test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured -[RUNNING] target[..]foo-[..] running 1 test test [..] ... ok test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured -[DOCTEST] foo running 0 tests test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured -", - p.url()))) +")) }); test!(lib_with_standard_name { @@ -593,30 +588,30 @@ test!(lib_with_standard_name { assert_that(p.cargo_process("test"), execs().with_status(0) - .with_stdout(&format!("\ + .with_stderr(&format!("\ [COMPILING] syntax v0.0.1 ({dir}) [RUNNING] target[..]syntax-[..] - +[RUNNING] target[..]test-[..] +[DOCTEST] syntax", dir = p.url())) + .with_stdout(" running 1 test test foo_test ... ok test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured -[RUNNING] target[..]test-[..] running 1 test test test ... ok test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured -[DOCTEST] syntax running 1 test test foo_0 ... ok test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured -", dir = p.url()))); +")); }); test!(lib_with_standard_name2 { @@ -646,17 +641,16 @@ test!(lib_with_standard_name2 { assert_that(p.cargo_process("test"), execs().with_status(0) - .with_stdout(&format!("\ + .with_stderr(&format!("\ [COMPILING] syntax v0.0.1 ({dir}) -[RUNNING] target[..]syntax-[..] - +[RUNNING] target[..]syntax-[..]", dir = p.url())) + .with_stdout(" running 1 test test test ... ok test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured -", - dir = p.url()))); +")); }); test!(lib_without_name { @@ -685,16 +679,16 @@ test!(lib_without_name { assert_that(p.cargo_process("test"), execs().with_status(0) - .with_stdout(&format!("\ + .with_stderr(&format!("\ [COMPILING] syntax v0.0.1 ({dir}) -[RUNNING] target[..]syntax-[..] - +[RUNNING] target[..]syntax-[..]", dir = p.url())) + .with_stdout(" running 1 test test test ... ok test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured -", dir = p.url()))); +")); }); test!(bin_without_name { @@ -935,25 +929,24 @@ test!(test_dylib { assert_that(p.cargo_process("test"), execs().with_status(0) - .with_stdout(&format!("\ + .with_stderr(&format!("\ [COMPILING] bar v0.0.1 ({dir}/bar) [COMPILING] foo v0.0.1 ({dir}) [RUNNING] target[..]foo-[..] - +[RUNNING] target[..]test-[..]", dir = p.url())) + .with_stdout(" running 1 test test foo ... ok test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured -[RUNNING] target[..]test-[..] running 1 test test foo ... ok test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured -", - dir = p.url()))); +")); p.root().move_into_the_past().unwrap(); assert_that(p.cargo("test"), execs().with_status(0) @@ -993,23 +986,22 @@ test!(test_twice_with_build_cmd { assert_that(p.cargo_process("test"), execs().with_status(0) - .with_stdout(&format!("\ + .with_stderr(&format!("\ [COMPILING] foo v0.0.1 ({dir}) [RUNNING] target[..]foo-[..] - +[DOCTEST] foo", dir = p.url())) + .with_stdout(" running 1 test test foo ... ok test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured -[DOCTEST] foo running 0 tests test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured -", - dir = p.url()))); +")); assert_that(p.cargo("test"), execs().with_status(0) @@ -1045,23 +1037,22 @@ test!(test_then_build { assert_that(p.cargo_process("test"), execs().with_status(0) - .with_stdout(&format!("\ + .with_stderr(&format!("\ [COMPILING] foo v0.0.1 ({dir}) [RUNNING] target[..]foo-[..] - +[DOCTEST] foo", dir = p.url())) + .with_stdout(" running 1 test test foo ... ok test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured -[DOCTEST] foo running 0 tests test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured -", - dir = p.url()))); +")); assert_that(p.cargo("build"), execs().with_status(0) @@ -1108,20 +1099,18 @@ test!(test_run_specific_bin_target { .file("src/bin1.rs", "#[test] fn test1() { }") .file("src/bin2.rs", "#[test] fn test2() { }"); - let expected_stdout = format!("\ + assert_that(prj.cargo_process("test").arg("--bin").arg("bin2"), + execs().with_status(0) + .with_stderr(format!("\ [COMPILING] foo v0.0.1 ({dir}) -[RUNNING] target[..]bin2-[..] - +[RUNNING] target[..]bin2-[..]", dir = prj.url())) + .with_stdout(" running 1 test test test2 ... ok test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured -", - dir = prj.url()); - - assert_that(prj.cargo_process("test").arg("--bin").arg("bin2"), - execs().with_status(0).with_stdout(&expected_stdout)); +")); }); test!(test_run_specific_test_target { @@ -1137,20 +1126,18 @@ test!(test_run_specific_test_target { .file("tests/a.rs", "#[test] fn test_a() { }") .file("tests/b.rs", "#[test] fn test_b() { }"); - let expected_stdout = format!("\ + assert_that(prj.cargo_process("test").arg("--test").arg("b"), + execs().with_status(0) + .with_stderr(format!("\ [COMPILING] foo v0.0.1 ({dir}) -[RUNNING] target[..]b-[..] - +[RUNNING] target[..]b-[..]", dir = prj.url())) + .with_stdout(" running 1 test test test_b ... ok test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured -", - dir = prj.url()); - - assert_that(prj.cargo_process("test").arg("--test").arg("b"), - execs().with_status(0).with_stdout(&expected_stdout)); +")); }); test!(test_no_harness { @@ -1229,56 +1216,53 @@ test!(selective_testing { println!("d1"); assert_that(p.cargo("test").arg("-p").arg("d1"), execs().with_status(0) - .with_stdout(&format!("\ + .with_stderr(&format!("\ [COMPILING] d1 v0.0.1 ({dir}/d1) [RUNNING] target[..]d1-[..] - +[RUNNING] target[..]d1-[..]", dir = p.url())) + .with_stdout(" running 0 tests test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured -[RUNNING] target[..]d1-[..] running 0 tests test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured -", - dir = p.url()))); +")); println!("d2"); assert_that(p.cargo("test").arg("-p").arg("d2"), execs().with_status(0) - .with_stdout(&format!("\ + .with_stderr(&format!("\ [COMPILING] d2 v0.0.1 ({dir}/d2) [RUNNING] target[..]d2-[..] - +[RUNNING] target[..]d2-[..]", dir = p.url())) + .with_stdout(" running 0 tests test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured -[RUNNING] target[..]d2-[..] running 0 tests test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured -", - dir = p.url()))); +")); println!("whole"); assert_that(p.cargo("test"), execs().with_status(0) - .with_stdout(&format!("\ + .with_stderr(&format!("\ [COMPILING] foo v0.0.1 ({dir}) -[RUNNING] target[..]foo-[..] - +[RUNNING] target[..]foo-[..]", dir = p.url())) + .with_stdout(" running 0 tests test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured -", - dir = p.url()))); +")); }); test!(almost_cyclic_but_not_quite { @@ -1427,21 +1411,21 @@ test!(selective_testing_with_docs { assert_that(p.cargo("test").arg("-p").arg("d1"), execs().with_status(0) - .with_stdout(&format!("\ + .with_stderr(&format!("\ [COMPILING] d1 v0.0.1 ({dir}/d1) [RUNNING] target[..]deps[..]d1[..] - +[DOCTEST] d1", dir = p.url())) + .with_stdout(" running 0 tests test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured -[DOCTEST] d1 running 0 tests test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured -", dir = p.url()))); +")); }); test!(example_bin_same_name { -- 2.30.2